Merge branch 'master' of ssh://alexl@git.gnome.org/git/gtk+
authorAlexander Larsson <alexl@redhat.com>
Tue, 7 Apr 2009 17:29:19 +0000 (19:29 +0200)
committerAlexander Larsson <alexl@redhat.com>
Tue, 7 Apr 2009 17:29:19 +0000 (19:29 +0200)

Trivial merge